[maven-release-plugin][skip ci] prepare release v1.88

* ACS-3275: Initial commit

* ACS-3275: Add newly generated POJO

* ACS-3275: Add requests

* ACS-3275: Add Rest Models Collection

packaging/tests/tas-restapi/.github/dependabot.yml

@@ -0,0 +1,22 @@
+version: 2
+registries:
+  maven-alfresco-internal:
+    type: maven-repository
+    url: https://artifacts.alfresco.com/nexus/content/groups/internal
+    username: ${{secrets.NEXUS_USERNAME}}
+    password: ${{secrets.NEXUS_PASSWORD}}
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "22:00"
+    timezone: Europe/London
+  open-pull-requests-limit: 99
+  registries:
+  - maven-alfresco-internal
+  ignore:
+    # httpclient 4.5.7 and above normalize URIs removing empty path params
+    # check https://alfresco.atlassian.net/browse/ACS-3186 for more details
+    - dependency-name: "org.apache.httpcomponents:httpclient-osgi"
+      versions: ">= 4.5.7"

packaging/tests/tas-restapi/.travis.yml

@@ -1,4 +1,4 @@
-dist: trusty
+dist: focal
 sudo: required
 language: java
 jdk:

packaging/tests/tas-restapi/README.md

@@ -20,7 +20,7 @@ Back to [TAS Master Documentation](https://git.alfresco.com/tas/alfresco-tas-uti
     * [Configuration](#configuration)
     * [How to enable Test Rail Integration?](#how-to-enable-test-rail-integration)
 * [Reference](#reference)
-* [Change Log](docs/CHANGELOG.md) :glowing_star: 
+* [Change Log](docs/CHANGELOG.md) 🌟
 * [Contributors](#contributors)
 * [Releasing](#releasing)
 * [License](#license)

packaging/tests/tas-restapi/pom.xml

@@ -4,11 +4,11 @@
     <groupId>org.alfresco.tas</groupId>
     <artifactId>restapi</artifactId>
     <name>alfresco-tas-restapi</name>
-    <version>1.57</version>
+    <version>1.88</version>
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-super-pom</artifactId>
-        <version>10</version>
+        <version>12</version>
     </parent>
 
 	<organization>
@@ -28,27 +28,45 @@
         <suiteXmlFile>src/main/resources/shared-resources/testCount.xml</suiteXmlFile>
         <maven.build.sourceVersion>11</maven.build.sourceVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tas.utility.version>3.0.21</tas.utility.version>
+        <tas.utility.version>3.0.48</tas.utility.version>
         <rest-assured.version>3.3.0</rest-assured.version>
-        <httpclient-osgi-version>4.5.3</httpclient-osgi-version>
+        <httpclient-osgi-version>4.5.6</httpclient-osgi-version>
         <json-path.version>3.3.0</json-path.version>
         <xml-path.version>3.3.0</xml-path.version>
         <json-schema-validator.version>3.3.0</json-schema-validator.version>
-        <jackson-databind.version>2.9.8</jackson-databind.version>
+        <jackson-databind.version>2.13.3</jackson-databind.version>
         <maven-release.version>2.5.3</maven-release.version>
         <org.glassfish.version>1.1.4</org.glassfish.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
-        <scribejava-apis.version>6.9.0</scribejava-apis.version>
+        <scribejava-apis.version>8.3.1</scribejava-apis.version>
         <test.exclude />
         <test.include />
         <java.version>11</java.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>rest-api-explorer-master</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <rest.api.explorer.branch>master</rest.api.explorer.branch>
+            </properties>
+        </profile>
+        <profile>
+            <id>rest-api-explorer-52N</id>
+            <properties>
+                <rest.api.explorer.branch>5.2.N</rest.api.explorer.branch>
+            </properties>
+        </profile>
+    </profiles>
+
     <scm>
         <connection>scm:git:https://github.com/Alfresco/alfresco-tas-restapi.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-tas-restapi.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-tas-restapi</url>
-        <tag>v1.57</tag>
+        <tag>v1.88</tag>
     </scm>
 
     <issueManagement>
@@ -120,11 +138,11 @@
                 </executions>
                 <configuration>
                     <arguments>
-                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/5.2.N/src/main/webapp/definitions/alfresco-auth.yaml</argument>
-                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/5.2.N/src/main/webapp/definitions/alfresco-core.yaml</argument>
-                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/5.2.N/src/main/webapp/definitions/alfresco-discovery.yaml</argument>
-                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/5.2.N/src/main/webapp/definitions/alfresco-search.yaml</argument>
-                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/5.2.N/src/main/webapp/definitions/alfresco-workflow.yaml</argument>
+                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/${rest.api.explorer.branch}/src/main/webapp/definitions/alfresco-auth.yaml</argument>
+                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/${rest.api.explorer.branch}/src/main/webapp/definitions/alfresco-core.yaml</argument>
+                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/${rest.api.explorer.branch}/src/main/webapp/definitions/alfresco-discovery.yaml</argument>
+                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/${rest.api.explorer.branch}/src/main/webapp/definitions/alfresco-search.yaml</argument>
+                        <argument>https://raw.githubusercontent.com/Alfresco/rest-api-explorer/${rest.api.explorer.branch}/src/main/webapp/definitions/alfresco-workflow.yaml</argument>
                     </arguments>
                     <mainClass>org.alfresco.rest.core.swagger.Generator</mainClass>
                 </configuration>
@@ -255,14 +273,14 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.36</version>
         </dependency>
         
 		<!-- swagger parser -->
 		<dependency>
 			<groupId>io.swagger</groupId>
 			<artifactId>swagger-parser</artifactId>
-			<version>1.0.23</version>
+			<version>1.0.61</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>commons-lang3</artifactId>
@@ -274,7 +292,7 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.12.1</version>
+            <version>2.12.2</version>
         </dependency>
         
 		<!--fixing java.lang.ClassCastException: class [B cannot be cast to class [C ([B and [C are in module java.base of loader 'bootstrap')  -->              
@@ -282,14 +300,14 @@
 		<dependency>
 		    <groupId>org.codehaus.groovy</groupId>
 		    <artifactId>groovy</artifactId>
-		    <version>2.5.9</version>
+		    <version>3.0.11</version>
 		</dependency>
 		
 		<!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->
 		<dependency>
 		    <groupId>org.codehaus.groovy</groupId>
 		    <artifactId>groovy-json</artifactId>
-		    <version>2.5.9</version>
+		    <version>3.0.11</version>
 		</dependency>	
 
 	</dependencies>
@@ -299,7 +317,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.0</version>
                 <reportSets>
                     <reportSet>
                         <reports>

packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java

@@ -1129,6 +1129,20 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
         this.serverURI = restProperties.envProperty().getSolrServerUrl();
         this.serverPort = restProperties.envProperty().getSolrPort();
         configureServerEndpoint();
+        configureSecretHeader();
+    }
+
+    /**
+     * Adds the secret Solr header if it has been set
+     */
+    private void configureSecretHeader()
+    {
+        String solrSecret = restProperties.envProperty().getSolrSecret();
+        if(!solrSecret.isEmpty())
+        {
+            String solrSecretName = restProperties.envProperty().getSolrSecretName();
+            configureRequestSpec().addHeader(solrSecretName, solrSecret);
+        }
     }
 
     /**

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

@@ -0,0 +1,65 @@
+package org.alfresco.rest.model;
+
+import java.util.List;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-14 13:22' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestActionBodyExecTemplateModel extends TestModel implements IRestModel<RestActionBodyExecTemplateModel>
+{
+    @Override
+    public ModelAssertion<RestActionBodyExecTemplateModel> assertThat()
+    {
+        return new ModelAssertion<RestActionBodyExecTemplateModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestActionBodyExecTemplateModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestActionBodyExecTemplateModel model;
+
+    @Override
+    public RestActionBodyExecTemplateModel onModel()
+    {
+        return model;
+    }
+
+
+    @JsonProperty(required = true)    
+    private String actionDefinitionId;	    
+
+    private Object params;	    
+
+    public String getActionDefinitionId()
+    {
+        return this.actionDefinitionId;
+    }
+
+    public void setActionDefinitionId(String actionDefinitionId)
+    {
+        this.actionDefinitionId = actionDefinitionId;
+    }				
+
+    public Object getParams()
+    {
+        return this.params;
+    }
+
+    public void setParams(Object params)
+    {
+        this.params = params;
+    }				
+}
+ 

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2021 Alfresco Software, Ltd. All rights reserved.
+ * License rights for this program may be obtained from Alfresco Software, Ltd.
+ * pursuant to a written agreement and any use of this program without such an
+ * agreement is prohibited.
+ */
+package org.alfresco.rest.model;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'dedwards' on '2021-12-16 08:32' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestArchiveContentRequestModel extends TestModel implements IRestModel<RestArchiveContentRequestModel>
+{
+    @Override
+    public ModelAssertion<RestArchiveContentRequestModel> assertThat()
+    {
+        return new ModelAssertion<RestArchiveContentRequestModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestArchiveContentRequestModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestArchiveContentRequestModel model;
+
+    @Override
+    public RestArchiveContentRequestModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    A map (String-String) of archive request properties for given content.
+
+    */	        
+
+    private Object archiveProperties;	    
+
+    public Object getArchiveProperties()
+    {
+        return this.archiveProperties;
+    }
+
+    public void setArchiveProperties(Object archiveProperties)
+    {
+        this.archiveProperties = archiveProperties;
+    }				
+}
+ 

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

@@ -0,0 +1,100 @@
+package org.alfresco.rest.model;
+
+import java.util.List;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestCompositeConditionDefinitionModel extends TestModel implements IRestModel<RestCompositeConditionDefinitionModel>
+{
+    @Override
+    public ModelAssertion<RestCompositeConditionDefinitionModel> assertThat()
+    {
+        return new ModelAssertion<RestCompositeConditionDefinitionModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestCompositeConditionDefinitionModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestCompositeConditionDefinitionModel model;
+
+    @Override
+    public RestCompositeConditionDefinitionModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    Whether to invert the logic for this condition (if true then "not" is applied to the whole condition)
+    */	        
+
+    private boolean inverted;	    
+    /**
+    How to combine the clauses of this condition ("and" or "or")
+    */	        
+
+    private String booleanMode;	    
+    /**
+    Nested list of composite clauses in this condition
+    */	        
+
+    private List<RestCompositeConditionDefinitionModel> compositeConditions;	    
+    /**
+    Nested list of simple (per field) conditions.
+    */	        
+
+    private List<RestSimpleConditionDefinitionModel> simpleConditions;	    
+
+    public boolean getInverted()
+    {
+        return this.inverted;
+    }
+
+    public void setInverted(boolean inverted)
+    {
+        this.inverted = inverted;
+    }				
+
+    public String getBooleanMode()
+    {
+        return this.booleanMode;
+    }
+
+    public void setBooleanMode(String booleanMode)
+    {
+        this.booleanMode = booleanMode;
+    }				
+
+    public List<RestCompositeConditionDefinitionModel> getCompositeConditions()
+    {
+        return this.compositeConditions;
+    }
+
+    public void setCompositeConditions(List<RestCompositeConditionDefinitionModel> compositeConditions)
+    {
+        this.compositeConditions = compositeConditions;
+    }				
+
+    public List<RestSimpleConditionDefinitionModel> getSimpleConditions()
+    {
+        return this.simpleConditions;
+    }
+
+    public void setSimpleConditions(List<RestSimpleConditionDefinitionModel> simpleConditions)
+    {
+        this.simpleConditions = simpleConditions;
+    }				
+}
+ 

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

@@ -2,6 +2,8 @@ package org.alfresco.rest.model;
 
 import org.alfresco.utility.model.TestModel;
 
+import java.util.Set;
+
 /**
  * Created by Claudia Agache on 11/11/2016.
  */
@@ -11,6 +13,7 @@ public class RestContentModel extends TestModel
     private String mimeTypeName;
     private String mimeType;
     private String encoding;
+    private Set<String> storageClasses;
 
     public int getSizeInBytes()
     {
@@ -51,4 +54,14 @@ public class RestContentModel extends TestModel
     {
         this.encoding = encoding;
     }
+
+    public Set<String> getStorageClasses()
+    {
+        return storageClasses;
+    }
+
+    public void setStorageClasses(Set<String> storageClasses)
+    {
+        this.storageClasses = storageClasses;
+    }
 }

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

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2021 Alfresco Software, Ltd. All rights reserved.
+ * License rights for this program may be obtained from Alfresco Software, Ltd.
+ * pursuant to a written agreement and any use of this program without such an
+ * agreement is prohibited.
+ */
+package org.alfresco.rest.model;
+
+import java.util.Map;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'dedwards' on '2021-12-16 08:32' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestContentStorageInfoModel extends TestModel implements IRestModel<RestContentStorageInfoModel>
+{
+    @Override
+    public ModelAssertion<RestContentStorageInfoModel> assertThat()
+    {
+        return new ModelAssertion<RestContentStorageInfoModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestContentStorageInfoModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestContentStorageInfoModel model;
+
+    @Override
+    public RestContentStorageInfoModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    Content type property identifier (e.g. cm:content). Inside this object only colon (':') delimiter for namespace-prefix will be used.
+
+    */	        
+
+    @JsonProperty(required = true)    
+    private String id;	    
+    /**
+    A map (String-String) of storage properties for given content.
+
+    */	        
+
+    private Map<String, String> storageProperties;	    
+
+    public String getId()
+    {
+        return this.id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }				
+
+    public Map<String, String> getStorageProperties()
+    {
+        return this.storageProperties;
+    }
+
+    public void setStorageProperties(Map<String, String> storageProperties)
+    {
+        this.storageProperties = storageProperties;
+    }				
+}
+ 

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

@@ -0,0 +1,56 @@
+package org.alfresco.rest.model;
+
+import java.util.List;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestLinkedRuleSetBodyCreateModel extends TestModel implements IRestModel<RestLinkedRuleSetBodyCreateModel>
+{
+    @Override
+    public ModelAssertion<RestLinkedRuleSetBodyCreateModel> assertThat()
+    {
+        return new ModelAssertion<RestLinkedRuleSetBodyCreateModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestLinkedRuleSetBodyCreateModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestLinkedRuleSetBodyCreateModel model;
+
+    @Override
+    public RestLinkedRuleSetBodyCreateModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    Identifier for either the folder or the rule set
+    */	        
+
+    @JsonProperty(required = true)    
+    private String id;	    
+
+    public String getId()
+    {
+        return this.id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }				
+}
+ 

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

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2021 Alfresco Software, Ltd. All rights reserved.
+ * License rights for this program may be obtained from Alfresco Software, Ltd.
+ * pursuant to a written agreement and any use of this program without such an
+ * agreement is prohibited.
+ */
+package org.alfresco.rest.model;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'dedwards' on '2021-12-16 08:32' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestRestoreArchivedContentRequestModel extends TestModel implements IRestModel<RestRestoreArchivedContentRequestModel>
+{
+    @Override
+    public ModelAssertion<RestRestoreArchivedContentRequestModel> assertThat()
+    {
+        return new ModelAssertion<RestRestoreArchivedContentRequestModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestRestoreArchivedContentRequestModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestRestoreArchivedContentRequestModel model;
+
+    @Override
+    public RestRestoreArchivedContentRequestModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    Restore from archive priority (Standard/High - to be mapped to Storage Provider specific values in Cloud Connectors)
+    */	        
+
+    private String restorePriority;	    
+
+    public String getRestorePriority()
+    {
+        return this.restorePriority;
+    }
+
+    public void setRestorePriority(String restorePriority)
+    {
+        this.restorePriority = restorePriority;
+    }				
+}
+ 

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

@@ -0,0 +1,186 @@
+package org.alfresco.rest.model;
+
+import java.util.List;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestRuleBodyModel extends TestModel implements IRestModel<RestRuleBodyModel>
+{
+    @Override
+    public ModelAssertion<RestRuleBodyModel> assertThat()
+    {
+        return new ModelAssertion<RestRuleBodyModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestRuleBodyModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestRuleBodyModel model;
+
+    @Override
+    public RestRuleBodyModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    Name of the rule
+    */	        
+
+    @JsonProperty(required = true)    
+    private String name;	    
+    /**
+    Description of the rule
+    */	        
+
+    private String description;	    
+    /**
+    Whether the rule is enabled
+    */	        
+
+    private boolean enabled;	    
+    /**
+    Whether the rule also applies to subfolders
+    */	        
+
+    private boolean cascade;	    
+    /**
+    Whether the rule should be run in the background
+    */	        
+
+    private boolean asynchronous;	    
+    /**
+    If the rule should be run in the background then an optional error script can be referenced
+    */	        
+
+    private String errorScript;	    
+    /**
+    The set of triggers that cause the rule to be activated.
+* inbound - The rule should be activated when an item enters the folder
+* update - The rule should be activated when an item within the folder is updated
+* outbound - The rule should be activated when an item leaves the folder or is deleted
+
+    */	        
+
+    private List<String> triggers;	    
+    /**
+    The conditions that determine whether the actions will be executed for a rule.
+
+A condition should contain at least one entry in compositeConditions or simpleConditions.
+
+If the field is omitted then the rule will apply to all nodes.
+
+    */	        
+
+    private RestCompositeConditionDefinitionModel conditions;	    
+    /**
+    The actions for the rule
+    */	        
+
+    @JsonProperty(required = true)    
+    private List<RestActionBodyExecTemplateModel> actions;	    
+
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }				
+
+    public String getDescription()
+    {
+        return this.description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }				
+
+    public boolean getEnabled()
+    {
+        return this.enabled;
+    }
+
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }				
+
+    public boolean getCascade()
+    {
+        return this.cascade;
+    }
+
+    public void setCascade(boolean cascade)
+    {
+        this.cascade = cascade;
+    }				
+
+    public boolean getAsynchronous()
+    {
+        return this.asynchronous;
+    }
+
+    public void setAsynchronous(boolean asynchronous)
+    {
+        this.asynchronous = asynchronous;
+    }				
+
+    public String getErrorScript()
+    {
+        return this.errorScript;
+    }
+
+    public void setErrorScript(String errorScript)
+    {
+        this.errorScript = errorScript;
+    }				
+
+    public List<String> getTriggers()
+    {
+        return this.triggers;
+    }
+
+    public void setTriggers(List<String> triggers)
+    {
+        this.triggers = triggers;
+    }				
+
+    public RestCompositeConditionDefinitionModel getConditions()
+    {
+        return this.conditions;
+    }
+
+    public void setConditions(RestCompositeConditionDefinitionModel conditions)
+    {
+        this.conditions = conditions;
+    }				
+
+    public List<RestActionBodyExecTemplateModel> getActions()
+    {
+        return this.actions;
+    }
+
+    public void setActions(List<RestActionBodyExecTemplateModel> actions)
+    {
+        this.actions = actions;
+    }				
+}
+ 

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

@@ -0,0 +1,218 @@
+package org.alfresco.rest.model;
+
+import java.util.List;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestRuleModel extends TestModel implements IRestModel<RestRuleModel>
+{
+    @Override
+    public ModelAssertion<RestRuleModel> assertThat()
+    {
+        return new ModelAssertion<RestRuleModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestRuleModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestRuleModel model;
+
+    @Override
+    public RestRuleModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    Identifier for the rule
+    */	        
+
+    @JsonProperty(required = true)    
+    private String id;	    
+    /**
+    Name of the rule
+    */	        
+
+    @JsonProperty(required = true)    
+    private String name;	    
+    /**
+    Description of the rule
+    */	        
+
+    private String description;	    
+    /**
+    Whether the rule is enabled
+    */	        
+
+    private boolean enabled;	    
+    /**
+    Whether the rule also applies to subfolders
+    */	        
+
+    private boolean cascade;	    
+    /**
+    Whether the rule should be run in the background
+    */	        
+
+    private boolean asynchronous;	    
+    /**
+    If the rule should be run in the background then an optional error script can be referenced
+    */	        
+
+    private String errorScript;	    
+    /**
+    Whether the rule has been shared with more than one folder
+    */	        
+
+    @JsonProperty(required = true)    
+    private boolean shared;	    
+    /**
+    The set of triggers that cause the rule to be activated.
+* inbound - The rule should be activated when an item enters the folder
+* update - The rule should be activated when an item within the folder is updated
+* outbound - The rule should be activated when an item leaves the folder or is deleted
+
+    */	        
+
+    private List<String> triggers;	    
+    /**
+    The conditions that determine whether the actions will be executed for a rule.
+
+A condition should contain at least one entry in compositeConditions or simpleConditions.
+
+If the field is omitted then the rule will apply to all nodes.
+
+    */	        
+
+    private RestCompositeConditionDefinitionModel conditions;	    
+    /**
+    The actions for the rule
+    */	        
+
+    @JsonProperty(required = true)    
+    private List<RestActionBodyExecTemplateModel> actions;	    
+
+    public String getId()
+    {
+        return this.id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }				
+
+    public String getName()
+    {
+        return this.name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }				
+
+    public String getDescription()
+    {
+        return this.description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }				
+
+    public boolean getEnabled()
+    {
+        return this.enabled;
+    }
+
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }				
+
+    public boolean getCascade()
+    {
+        return this.cascade;
+    }
+
+    public void setCascade(boolean cascade)
+    {
+        this.cascade = cascade;
+    }				
+
+    public boolean getAsynchronous()
+    {
+        return this.asynchronous;
+    }
+
+    public void setAsynchronous(boolean asynchronous)
+    {
+        this.asynchronous = asynchronous;
+    }				
+
+    public String getErrorScript()
+    {
+        return this.errorScript;
+    }
+
+    public void setErrorScript(String errorScript)
+    {
+        this.errorScript = errorScript;
+    }				
+
+    public boolean getShared()
+    {
+        return this.shared;
+    }
+
+    public void setShared(boolean shared)
+    {
+        this.shared = shared;
+    }				
+
+    public List<String> getTriggers()
+    {
+        return this.triggers;
+    }
+
+    public void setTriggers(List<String> triggers)
+    {
+        this.triggers = triggers;
+    }				
+
+    public RestCompositeConditionDefinitionModel getConditions()
+    {
+        return this.conditions;
+    }
+
+    public void setConditions(RestCompositeConditionDefinitionModel conditions)
+    {
+        this.conditions = conditions;
+    }				
+
+    public List<RestActionBodyExecTemplateModel> getActions()
+    {
+        return this.actions;
+    }
+
+    public void setActions(List<RestActionBodyExecTemplateModel> actions)
+    {
+        this.actions = actions;
+    }				
+}
+ 

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

@@ -0,0 +1,8 @@
+package org.alfresco.rest.model;
+
+import org.alfresco.rest.core.RestModels;
+
+public class RestRuleModelsCollection extends RestModels<RestRuleModel, RestRuleModelsCollection>
+{
+
+}

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

@@ -0,0 +1,60 @@
+package org.alfresco.rest.model;
+
+import java.util.List;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestRuleSetBodyUpdateModel extends TestModel implements IRestModel<RestRuleSetBodyUpdateModel>
+{
+    @Override
+    public ModelAssertion<RestRuleSetBodyUpdateModel> assertThat()
+    {
+        return new ModelAssertion<RestRuleSetBodyUpdateModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestRuleSetBodyUpdateModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestRuleSetBodyUpdateModel model;
+
+    @Override
+    public RestRuleSetBodyUpdateModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    An ordered list of the rule ids within the rule set.
+
+Rules may not be added or removed from the rule set using this endpoint.
+
+If this field is omitted then there is no change to the rule ordering.
+
+    */	        
+
+    private List<String> ruleIds;	    
+
+    public List<String> getRuleIds()
+    {
+        return this.ruleIds;
+    }
+
+    public void setRuleIds(List<String> ruleIds)
+    {
+        this.ruleIds = ruleIds;
+    }				
+}
+ 

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

@@ -0,0 +1,105 @@
+package org.alfresco.rest.model;
+
+import java.util.List;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestRuleSetModel extends TestModel implements IRestModel<RestRuleSetModel>
+{
+    @Override
+    public ModelAssertion<RestRuleSetModel> assertThat()
+    {
+        return new ModelAssertion<RestRuleSetModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestRuleSetModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestRuleSetModel model;
+
+    @Override
+    public RestRuleSetModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    Identifier for the rule set
+    */	        
+
+    @JsonProperty(required = true)    
+    private String id;	    
+    /**
+    True if the rule set is shared to at least one folder
+    */	        
+
+    @JsonProperty(required = true)    
+    private boolean shared;	    
+    /**
+    List of folder identifiers which use the rule set.
+
+Note that any folders the user does not have access to will not appear in this list. Use **shared** instead to check existence of any link.
+
+    */	        
+
+    private List<String> usedBy;	    
+    /**
+    An ordered list of the rule ids within the rule set
+    */	        
+
+    private List<String> ruleIds;	    
+
+    public String getId()
+    {
+        return this.id;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }				
+
+    public boolean getShared()
+    {
+        return this.shared;
+    }
+
+    public void setShared(boolean shared)
+    {
+        this.shared = shared;
+    }				
+
+    public List<String> getUsedBy()
+    {
+        return this.usedBy;
+    }
+
+    public void setUsedBy(List<String> usedBy)
+    {
+        this.usedBy = usedBy;
+    }				
+
+    public List<String> getRuleIds()
+    {
+        return this.ruleIds;
+    }
+
+    public void setRuleIds(List<String> ruleIds)
+    {
+        this.ruleIds = ruleIds;
+    }				
+}
+ 

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

@@ -0,0 +1,8 @@
+package org.alfresco.rest.model;
+
+import org.alfresco.rest.core.RestModels;
+
+public class RestRuleSetModelsCollection extends RestModels<RestRuleSetModel, RestRuleSetModelsCollection>
+{
+
+}

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

@@ -0,0 +1,108 @@
+package org.alfresco.rest.model;
+
+import java.util.List;
+
+import org.alfresco.rest.core.IRestModel;
+import org.alfresco.rest.core.assertion.ModelAssertion;
+import org.alfresco.utility.model.TestModel;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Generated by 'Kristian.Dimitrov@hyland.com' on '2022-07-13 15:53' from 'Alfresco Content Services REST API' swagger file 
+ * Generated from 'Alfresco Content Services REST API' swagger file
+ * Base Path {@linkplain /alfresco/api/-default-/public/alfresco/versions/1}
+ */
+public class RestSimpleConditionDefinitionModel extends TestModel implements IRestModel<RestSimpleConditionDefinitionModel>
+{
+    @Override
+    public ModelAssertion<RestSimpleConditionDefinitionModel> assertThat()
+    {
+        return new ModelAssertion<RestSimpleConditionDefinitionModel>(this);
+    }
+
+    @Override
+    public ModelAssertion<RestSimpleConditionDefinitionModel> and()
+    {
+        return assertThat();
+    }
+
+    @JsonProperty(value = "entry")
+    RestSimpleConditionDefinitionModel model;
+
+    @Override
+    public RestSimpleConditionDefinitionModel onModel()
+    {
+        return model;
+    }
+
+    /**
+    The name of the property to compare.
+
+This should be either a property (e.g. "cm:name") or one of the keywords from this list:
+* size (the size of the content for a node)
+* mimetype (the mimetype of the content for a node)
+* encoding (the encoding of the content for a node)
+* category (a category for the node)
+* tag (a tag that the node has)
+* aspect (an aspect that the node has)
+
+For multi-valued properties the condition is satisfied if any of the values match the condition.
+
+    */	        
+
+    @JsonProperty(required = true)    
+    private String field;	    
+    /**
+    The method to compare the property against the parameter.
+
+Depending on the type of the property then different comparators are available:
+* All types: equals
+* text: contains, startsWith, endsWith
+* int/long/float/double/date: greaterThan, lessThan, greaterThanOrEqual, lessThanOrEqual
+* type: instanceOf
+
+Where a property is multivalued then the condition is true if it is satisfied by any of the values.
+
+    */	        
+
+    @JsonProperty(required = true)    
+    private String comparator;	    
+    /**
+    The value to compare the field against
+    */	        
+
+    @JsonProperty(required = true)    
+    private String parameter;	    
+
+    public String getField()
+    {
+        return this.field;
+    }
+
+    public void setField(String field)
+    {
+        this.field = field;
+    }				
+
+    public String getComparator()
+    {
+        return this.comparator;
+    }
+
+    public void setComparator(String comparator)
+    {
+        this.comparator = comparator;
+    }				
+
+    public String getParameter()
+    {
+        return this.parameter;
+    }
+
+    public void setParameter(String parameter)
+    {
+        this.parameter = parameter;
+    }				
+}
+ 

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

@@ -1,5 +1,7 @@
 package org.alfresco.rest.model;
 
+import java.util.List;
+
 import org.alfresco.rest.core.IRestModel;
 import org.alfresco.rest.core.assertion.ModelAssertion;
 import org.alfresco.utility.model.TestModel;
@@ -7,7 +9,7 @@ import org.alfresco.utility.model.TestModel;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Generated by 'aforascu' on '2018-01-10 16:02' from 'Alfresco Content Services REST API' swagger file 
+ * Generated by 'tsalvado' on '2021-08-18 21:15' from 'Alfresco Content Services REST API' swagger file 
  * Generated from 'Alfresco Content Services REST API' swagger file
  * Base Path {@linkplain /alfresco/api}
  */
@@ -47,6 +49,9 @@ public class RestStatusInfoModel extends TestModel implements IRestModel<RestSta
     @JsonProperty(required = true)    
     private boolean isThumbnailGenerationEnabled;	    
 
+    @JsonProperty(required = true)    
+    private boolean isDirectAccessUrlEnabled;	    
+
     public boolean getIsReadOnly()
     {
         return this.isReadOnly;
@@ -86,5 +91,15 @@ public class RestStatusInfoModel extends TestModel implements IRestModel<RestSta
     {
         this.isThumbnailGenerationEnabled = isThumbnailGenerationEnabled;
     }				
+
+    public boolean getIsDirectAccessUrlEnabled()
+    {
+        return this.isDirectAccessUrlEnabled;
+    }
+
+    public void setIsDirectAccessUrlEnabled(boolean isDirectAccessUrlEnabled)
+    {
+        this.isDirectAccessUrlEnabled = isDirectAccessUrlEnabled;
+    }				
 }
  

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

@@ -0,0 +1,212 @@
+/*
+ * Copyright 2021 Alfresco Software, Ltd. All rights reserved.
+ * License rights for this program may be obtained from Alfresco Software, Ltd.
+ * pursuant to a written agreement and any use of this program without such an
+ * agreement is prohibited.
+ */
+package org.alfresco.rest.requests;
+
+import org.alfresco.rest.core.RestRequest;
+import org.alfresco.rest.core.RestResponse;
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestArchiveContentRequestModel;
+import org.alfresco.rest.model.RestContentStorageInfoModel;
+import org.alfresco.rest.model.RestRestoreArchivedContentRequestModel;
+import org.alfresco.utility.model.TestModel;
+import org.springframework.http.HttpMethod;
+
+public class ContentStorageInformation extends ModelRequest<ContentStorageInformation> 
+{
+    private static final String BASE_PATH = "nodes/{nodeId}/storage-info/{contentPropName}";
+    private static final String VERSIONS_BASE_PATH = "nodes/{nodeId}/versions/{versionId}/storage-info/{contentPropName}";
+    private static final String ARCHIVE_PATH_SUFFIX = "/archive";
+    private static final String ARCHIVE_RESTORE_PATH_SUFFIX = "/archive-restore";
+
+    private String nodeId;
+    private String contentPropName;
+    private String versionId;
+
+    public ContentStorageInformation(RestWrapper restWrapper) 
+    {
+        super(restWrapper);
+    }
+
+
+    public ContentStorageInformation withNodeId(String nodeId)
+    {
+        this.nodeId = nodeId;
+        return this;
+    }
+
+    public ContentStorageInformation withContentPropName(String contentPropName)
+    {
+        this.contentPropName = contentPropName;
+        return this;
+    }
+
+    public ContentStorageInformation withVersionId(String versionId)
+    {
+        this.versionId = versionId;
+        return this;
+    }
+
+    /**
+     * Get Content Storage Properties using GET call on "nodes/{nodeId}/storage-info/{contentPropName}"
+     * @return
+     */
+    public RestContentStorageInfoModel getStorageInfo()
+    {
+        return getStorageInfo(nodeId, contentPropName);
+    }
+
+    /**
+     * Get Content Version Storage Properties using GET call on "nodes/{nodeId}/versions/{versionId}/storage-info/{contentPropName}"
+     * @return
+     */
+    public RestContentStorageInfoModel getVersionStorageInfo()
+    {
+        return getVersionStorageInfo(nodeId, versionId, contentPropName);
+    }
+
+    /**
+     * Get Content Storage Properties using GET call on "nodes/{nodeId}/storage-info/{contentPropName}"
+     * @param nodeId The nodeId
+     * @param contentPropName The content property QNAME ie. "cm:content"
+     * @return
+     */
+    public RestContentStorageInfoModel getStorageInfo(String nodeId, String contentPropName)
+    {
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, BASE_PATH, nodeId, contentPropName);
+        return restWrapper.processModel(RestContentStorageInfoModel.class, request);
+    }
+
+    /**
+     * Get Content Version Storage Properties using GET call on "nodes/{nodeId}/versions/{versionId}/storage-info/{contentPropName}"
+     * @param nodeId The nodeId
+     * @param versionId The versionId
+     * @param contentPropName The content property QNAME ie. "cm:content"
+     * @return object of {@link RestContentStorageInfoModel}
+     */
+    public RestContentStorageInfoModel getVersionStorageInfo(String nodeId, String versionId, String contentPropName)
+    {
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, VERSIONS_BASE_PATH, nodeId, versionId, contentPropName);
+        return restWrapper.processModel(RestContentStorageInfoModel.class, request);
+    }
+
+    /**
+     * Send content to archive using POST call on "nodes/{nodeId}/storage-info/{contentPropName}/archive"
+     * 
+     * @param archiveContentRequest The request body
+     * @return
+     */
+    public RestResponse requestArchiveContent(RestArchiveContentRequestModel archiveContentRequest)
+    {
+        return requestArchiveContent(nodeId, contentPropName, archiveContentRequest);
+    }
+
+    /**
+     * Send version content to archive using POST call on "nodes/{nodeId}/versions/{versionId}/storage-info/{contentPropName}/archive"
+     *
+     * @param archiveContentRequest The request body
+     * @return
+     */
+    public RestResponse requestArchiveVersionContent(RestArchiveContentRequestModel archiveContentRequest)
+    {
+        return requestArchiveVersionContent(nodeId, contentPropName, versionId, archiveContentRequest);
+    }
+
+    /**
+     * Send content to archive using POST call on "nodes/{nodeId}/storage-info/{contentPropName}/archive"
+     * 
+     * @param nodeId The nodeId
+     * @param contentPropName The content property QNAME ie. "cm:content"
+     * @param archiveContentRequest The request body
+     * @return
+     */
+    public RestResponse requestArchiveContent(String nodeId, String contentPropName, RestArchiveContentRequestModel archiveContentRequest)
+    {
+        RestRequest request = createRestRequestWithBody(HttpMethod.POST, archiveContentRequest, BASE_PATH + ARCHIVE_PATH_SUFFIX, nodeId, contentPropName);
+        return restWrapper.process(request);
+    }
+
+    /**
+     * Send version content to archive using POST call on "nodes/{nodeId}/versions/{versionId}/storage-info/{contentPropName}/archive"
+     *
+     * @param nodeId The nodeId
+     * @param contentPropName The content property QNAME ie. "cm:content"
+     * @param versionId  The versionId
+     * @param archiveContentRequest The request body
+     * @return
+     */
+    public RestResponse requestArchiveVersionContent(String nodeId, String contentPropName, String versionId, RestArchiveContentRequestModel archiveContentRequest)
+    {
+        RestRequest request = createRestRequestWithBody(HttpMethod.POST, archiveContentRequest, VERSIONS_BASE_PATH + ARCHIVE_PATH_SUFFIX, nodeId, versionId, contentPropName);
+        return restWrapper.process(request);
+    }
+
+    /**
+     * Restore content from archive using POST call on "nodes/{nodeId}/storage-info/{contentPropName}/archive-restore"
+     * 
+     * @param restoreArchivedContentRequest The request body
+     * @return
+     */
+    public RestResponse requestRestoreContentFromArchive(RestRestoreArchivedContentRequestModel restoreArchivedContentRequest)
+    {
+        return requestRestoreContentFromArchive(nodeId, contentPropName, restoreArchivedContentRequest);
+    }
+
+    /**
+     * Restore version content from archive using POST call on "nodes/{nodeId}/storage-info/versions/{versionId}/{contentPropName}/archive-restore"
+     *
+     * @param restoreArchivedContentRequest The request body
+     * @return
+     */
+    public RestResponse requestRestoreVersionContentFromArchive(RestRestoreArchivedContentRequestModel restoreArchivedContentRequest)
+    {
+        return requestRestoreVersionContentFromArchive(nodeId, contentPropName, versionId, restoreArchivedContentRequest);
+    }
+
+    /**
+     * Restore content from archive using POST call on "nodes/{nodeId}/storage-info/{contentPropName}/archive-restore"
+     * 
+     * @param nodeId The nodeId
+     * @param contentPropName The content property QNAME ie. "cm:content"
+     * @param restoreArchivedContentRequest The request body
+     * @return
+     */
+    public RestResponse requestRestoreContentFromArchive(String nodeId, String contentPropName, RestRestoreArchivedContentRequestModel restoreArchivedContentRequest)
+    {
+        RestRequest request = createRestRequestWithBody(HttpMethod.POST, restoreArchivedContentRequest, BASE_PATH +
+                ARCHIVE_RESTORE_PATH_SUFFIX, nodeId, contentPropName);
+        return restWrapper.process(request);
+    }
+
+    /**
+     * Restore version content from archive using POST call on "nodes/{nodeId}/storage-info/{contentPropName}/archive-restore"
+     *
+     * @param nodeId The nodeId
+     * @param contentPropName The content property QNAME ie. "cm:content"
+     * @param versionId  The versionId
+     * @param restoreArchivedContentRequest The request body
+     * @return
+     */
+    public RestResponse requestRestoreVersionContentFromArchive(String nodeId, String contentPropName, String versionId,
+                                                                RestRestoreArchivedContentRequestModel restoreArchivedContentRequest)
+    {
+        RestRequest request = createRestRequestWithBody(HttpMethod.POST, restoreArchivedContentRequest, VERSIONS_BASE_PATH +
+                ARCHIVE_RESTORE_PATH_SUFFIX, nodeId, versionId, contentPropName);
+        return restWrapper.process(request);
+    }
+    
+    private RestRequest createRestRequestWithBody(HttpMethod httpMethod, TestModel request, String path, String... pathParams)
+    {
+        if (request != null)
+        {
+            return RestRequest.requestWithBody(httpMethod, request.toJson(), path, pathParams);
+        }
+        else
+        {
+            return RestRequest.simpleRequest(httpMethod, path, pathParams);
+        }
+    }
+}

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2022 Alfresco Software, Ltd. All rights reserved.
+ * License rights for this program may be obtained from Alfresco Software, Ltd.
+ * pursuant to a written agreement and any use of this program without such an
+ * agreement is prohibited.
+ */
+package org.alfresco.rest.requests;
+
+import org.alfresco.rest.core.RestRequest;
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.model.RestRuleModel;
+import org.springframework.http.HttpMethod;
+
+public class FolderRules extends ModelRequest<FolderRules>
+{
+    private static final String BASE_PATH = "nodes/{nodeId}/rule-sets/{ruleSetId}/rules";
+
+    private String nodeId;
+    private String ruleSetId;
+    private String ruleId;
+
+    public FolderRules withNodeId(String nodeId)
+    {
+        this.nodeId = nodeId;
+        return this;
+    }
+
+    public FolderRules withRuleSetId(String ruleSetId)
+    {
+        this.ruleSetId = ruleSetId;
+        return this;
+    }
+
+    public FolderRules withRuleId(String ruleId)
+    {
+        this.ruleId = ruleId;
+        return this;
+    }
+
+    public FolderRules(RestWrapper restWrapper)
+    {
+        super(restWrapper);
+    }
+
+    /**
+     * Gets a list of rules for the folder node using GET call on "nodes/{nodeId}/rule-sets/{ruleSetId}/rules"
+     * @return
+     */
+    public RestRuleModel getListOfRules()
+    {
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, BASE_PATH, nodeId, ruleSetId);
+        return restWrapper.processModel(RestRuleModel.class, request);
+    }
+
+    /**
+     * Gets a single rule definition for the folder node using GET call on "nodes/{nodeId}/rule-sets/{ruleSetId}/rules/{ruleId}"
+     * @return
+     */
+    public RestRuleModel getSingleRule()
+    {
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, BASE_PATH + "/{ruleId}", nodeId, ruleSetId, ruleId);
+        return restWrapper.processModel(RestRuleModel.class, request);
+    }
+}

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

@@ -499,7 +499,8 @@ public class Node extends ModelRequest<Node>
                 renditionId);
         RestResponse response = restWrapper.process(request);
         int retry = 0;
-        while (Integer.valueOf(response.getStatusCode()).equals(HttpStatus.NOT_FOUND.value()) && retry < Utility.retryCountSeconds)
+        //Multiplied by '4' because AI rendition test cases need more time (~30 seconds) - see ACS-2158
+        while (Integer.valueOf(response.getStatusCode()).equals(HttpStatus.NOT_FOUND.value()) && retry < (4 * Utility.retryCountSeconds))
         {
             Utility.waitToLoopTime(1);
             response = restWrapper.process(request);
@@ -589,6 +590,18 @@ public class Node extends ModelRequest<Node>
     }
 
 
+    /**
+     * Delete the rendition identified by renditionId using DELETE call on "/nodes/{nodeId}/renditions/{renditionId}"
+     *
+     * @param renditionId id of rendition to delete
+     * @throws Exception
+     */
+    public void deleteNodeRendition(String renditionId) throws Exception
+    {
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "nodes/{nodeId}/renditions/{renditionId}", repoModel.getNodeRef(), renditionId);
+        restWrapper.processEmptyModel(request);
+    }
+
     /**
      * Get a node's children using GET call 'nodes/{nodeId}/children
      * 
@@ -897,11 +910,33 @@ public class Node extends ModelRequest<Node>
 
     /**
      * Get Direct Access URL for a node
+     * @param postBody
      * @return
      */
-    public RestResponse createDirectAccessURL()
+    public RestResponse createDirectAccessURL(String postBody)
     {
-        RestRequest request = RestRequest.simpleRequest(HttpMethod.POST, "nodes/{nodeId}/request-content-url", this.repoModel.getNodeRef());
+        RestRequest request;
+        if (postBody == null)
+        {
+            request = RestRequest.simpleRequest(HttpMethod.POST, "nodes/{nodeId}/request-direct-access-url", this.repoModel.getNodeRef());
+        }
+        else
+        {
+            request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/request-direct-access-url", this.repoModel.getNodeRef());
+        }
+
+        return this.restWrapper.process(request);
+    }
+
+    /**
+     * Get Direct Access URL for a specific node rendition E.g "pdf"
+     * @param renditionId
+     * @return
+     */
+    public RestResponse createDirectAccessURLforRendition(String renditionId)
+    {
+        RestRequest request = RestRequest
+                .simpleRequest(HttpMethod.POST, "nodes/{nodeId}/renditions/{renditionId}/request-direct-access-url", this.repoModel.getNodeRef(), renditionId);
         return this.restWrapper.process(request);
     }
 
@@ -913,7 +948,7 @@ public class Node extends ModelRequest<Node>
     public RestResponse createDirectAccessURLforVersion(String versionId)
     {
         RestRequest request = RestRequest
-                .simpleRequest(HttpMethod.POST, "nodes/{nodeId}/versions/{versionId}/request-content-url", this.repoModel.getNodeRef(), versionId);
+                .simpleRequest(HttpMethod.POST, "nodes/{nodeId}/versions/{versionId}/request-direct-access-url", this.repoModel.getNodeRef(), versionId);
         return this.restWrapper.process(request);
     }
 
@@ -926,20 +961,30 @@ public class Node extends ModelRequest<Node>
     public RestResponse createDirectAccessURLforVersionAndRendition(String versionId, String renditionId)
     {
         RestRequest request = RestRequest
-                .simpleRequest(HttpMethod.POST, "nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/request-content-url", this.repoModel.getNodeRef(), versionId, renditionId);
+                .simpleRequest(HttpMethod.POST, "nodes/{nodeId}/versions/{versionId}/renditions/{renditionId}/request-direct-access-url", this.repoModel.getNodeRef(), versionId, renditionId);
         return this.restWrapper.process(request);
     }
 
-    /**
-     * Get Direct Access URL for a specific node rendition E.g "pdf"
-     * @param renditionId
-     * @return
-     */
-    public RestResponse createDirectAccessURLforRendition(String renditionId)
+    public ContentStorageInformation usingStorageInfo(String contentPropName)
     {
-        RestRequest request = RestRequest
-                .simpleRequest(HttpMethod.POST, "nodes/{nodeId}/renditions/{renditionId}/request-content-url", this.repoModel.getNodeRef(), renditionId);
-        return this.restWrapper.process(request);
+        return new ContentStorageInformation(restWrapper)
+            .withNodeId(repoModel.getNodeRef())
+            .withContentPropName(contentPropName);
     }
 
-}
+    public ContentStorageInformation usingVersionStorageInfo(String contentPropName, String versionId)
+    {
+        return new ContentStorageInformation(restWrapper)
+                .withNodeId(repoModel.getNodeRef())
+                .withContentPropName(contentPropName)
+                .withVersionId(versionId);
+    }
+
+    public FolderRules requestRules(String ruleId, String ruleSetId)
+    {
+        return new FolderRules(restWrapper)
+                .withNodeId(repoModel.getNodeRef())
+                .withRuleId(ruleId)
+                .withRuleSetId(ruleSetId);
+    }
+}

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

@@ -7,6 +7,7 @@ import org.alfresco.rest.model.RestTagModel;
 import org.alfresco.rest.model.RestTagModelsCollection;
 import org.alfresco.rest.requests.Actions;
 import org.alfresco.rest.requests.Audit;
+import org.alfresco.rest.requests.ContentStorageInformation;
 import org.alfresco.rest.requests.Downloads;
 import org.alfresco.rest.requests.Groups;
 import org.alfresco.rest.requests.ModelRequest;
@@ -98,6 +99,11 @@ public class RestCoreAPI extends ModelRequest<RestCoreAPI>
         return new Node(restWrapper);
     }
 
+    public ContentStorageInformation usingStorageInfo()
+    {
+        return new ContentStorageInformation(restWrapper);
+    }
+
     /**
      * Provides DSL of all REST calls under <code>/people</code> API path
      * 

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

@@ -1,6 +1,7 @@
 package org.alfresco.rest.search;
 
 import java.util.List;
+import java.util.Map;
 
 import org.alfresco.rest.core.IRestModel;
 import org.alfresco.rest.core.assertion.ModelAssertion;
@@ -40,7 +41,10 @@ public class SearchNodeModel extends TestModel implements IRestModel<SearchNodeM
     private boolean isFile;
 
     @JsonProperty
-    private boolean isLocked;
+    private Boolean isLocked;
+
+    @JsonProperty
+    private Map<String, Object> association;
 
     @JsonProperty(required = true)
     private String modifiedAt;
@@ -56,7 +60,7 @@ public class SearchNodeModel extends TestModel implements IRestModel<SearchNodeM
 
     private String parentId;
 
-    private boolean isLink;
+    private Boolean isLink;
 
     private RestContentModel content;
 
@@ -73,6 +77,16 @@ public class SearchNodeModel extends TestModel implements IRestModel<SearchNodeM
     
     private String location;
 
+    public Map<String, Object> getAssociation()
+    {
+        return association;
+    }
+
+    public void setAssociation(Map<String, Object> association)
+    {
+        this.association = association;
+    }
+
     public SearchScoreModel getSearch()
     {
         return search;
@@ -161,12 +175,12 @@ public class SearchNodeModel extends TestModel implements IRestModel<SearchNodeM
         this.isFile = isFile;
     }
 
-    public boolean isLocked()
+    public Boolean isLocked()
     {
         return isLocked;
     }
 
-    public void setLocked(boolean isLocked)
+    public void setLocked(Boolean isLocked)
     {
         this.isLocked = isLocked;
     }
@@ -221,12 +235,12 @@ public class SearchNodeModel extends TestModel implements IRestModel<SearchNodeM
         this.parentId = parentId;
     }
 
-    public boolean isLink()
+    public Boolean isLink()
     {
         return isLink;
     }
 
-    public void setLink(boolean isLink)
+    public void setIsLink(Boolean isLink)
     {
         this.isLink = isLink;
     }