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

Rest-assured to 4.1.2 (newest version)
httpclient-osgi 4.5.3 (dependency of rest-assured)

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

@@ -22,7 +22,7 @@ jobs:
   include:
     - stage: test
       name: "Build and test"
-      script: travis_retry mvn test
+      script: travis_retry mvn test -Dtest=ModelAssertionTest
     - stage: release
       name: "Push to Nexus"
       if: fork = false AND branch = master AND type != pull_request AND commit_message !~ /\[no-release\]/

packaging/tests/tas-restapi/pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.alfresco.tas</groupId>
     <artifactId>restapi</artifactId>
     <name>alfresco-tas-restapi</name>
-    <version>1.13</version>
+    <version>1.22</version>
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-super-pom</artifactId>
@@ -28,17 +28,17 @@
         <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.8</tas.utility.version>
+        <tas.utility.version>3.0.16</tas.utility.version>
         <rest-assured.version>3.3.0</rest-assured.version>
-        <httpclient-osgi-version>4.5.2</httpclient-osgi-version>
+        <httpclient-osgi-version>4.5.10</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>
         <maven-release.version>2.5.3</maven-release.version>
-        <org.glassfish.version>1.0.4</org.glassfish.version>
-        <commons-lang3.version>3.8</commons-lang3.version>
-        <scribejava-apis.version>6.5.1</scribejava-apis.version>
+        <org.glassfish.version>1.1.4</org.glassfish.version>
+        <commons-lang3.version>3.9</commons-lang3.version>
+        <scribejava-apis.version>6.9.0</scribejava-apis.version>
         <test.exclude />
         <test.include />
         <java.version>11</java.version>
@@ -48,7 +48,7 @@
         <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.13</tag>
+        <tag>v1.22</tag>
     </scm>
 
     <issueManagement>
@@ -157,7 +157,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
 
@@ -255,7 +255,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.29</version>
         </dependency>
         
 		<!-- swagger parser -->
@@ -282,14 +282,14 @@
 		<dependency>
 		    <groupId>org.codehaus.groovy</groupId>
 		    <artifactId>groovy</artifactId>
-		    <version>2.5.5</version>
+		    <version>2.5.8</version>
 		</dependency>
 		
 		<!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->
 		<dependency>
 		    <groupId>org.codehaus.groovy</groupId>
 		    <artifactId>groovy-json</artifactId>
-		    <version>2.5.5</version>
+		    <version>2.5.8</version>
 		</dependency>	
 
 	</dependencies>

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

@@ -96,6 +96,23 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
     private RequestSpecBuilder requestSpecBuilder = new RequestSpecBuilder();
     private Headers responseHeaders;
     private RestResponse response;
+    private String serverURI;
+    private int serverPort;
+
+    /**
+     * After configuring {@link #setServerURI(String)} and {@link #setServerPort(int)} call {@link #configureServerEndpoint()}
+     *
+     * @param serverURI in format of "http://localhost", without port. Set port via {@link #setServerPort(int)}
+     */
+    public void setServerURI(String serverURI)
+    {
+        this.serverURI = serverURI;
+    }
+
+    public void setServerPort(int serverPort)
+    {
+        this.serverPort = serverPort;
+    }
 
     @Autowired
     private RestAisAuthentication aisAuthentication;
@@ -131,10 +148,9 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
     @PostConstruct
     public void initializeRequestSpecBuilder()
     {
-        requestSpecBuilder = new RequestSpecBuilder();
-        configureServerEndpoint(
-                restProperties.envProperty().getTestServerUrl(),
-                restProperties.envProperty().getPort());
+        this.serverURI = restProperties.envProperty().getTestServerUrl();
+        this.serverPort = restProperties.envProperty().getPort();
+        configureServerEndpoint();
     }
 
     /**
@@ -616,7 +632,7 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
 
         logResponseInformation(restRequest, returnedResponse);
 
-        initializeRequestSpecBuilder();
+        configureServerEndpoint();
         response = new RestResponse(returnedResponse);
         return returnedResponse;
     }
@@ -1091,26 +1107,31 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
 
     public void configureSyncServiceEndPoint()
     {
-        configureServerEndpoint(
-                restProperties.envProperty().getSyncServerUrl(),
-                restProperties.envProperty().getSyncPort());
+        this.serverURI = restProperties.envProperty().getSyncServerUrl();
+        this.serverPort = restProperties.envProperty().getSyncPort();
+        configureServerEndpoint();
     }
 
     public void configureSolrEndPoint()
     {
-        configureServerEndpoint(
-                restProperties.envProperty().getSolrServerUrl(),
-                restProperties.envProperty().getSolrPort());
+        this.serverURI = restProperties.envProperty().getSolrServerUrl();
+        this.serverPort = restProperties.envProperty().getSolrPort();
+        configureServerEndpoint();
     }
 
     /**
-     * @param baseURI String of format http://127.0.0.1 without port
+     * Use {@link #setServerURI(String)} and {@link #setServerPort(int)}
      */
-    public void configureServerEndpoint(String baseURI, int port)
+    public void configureServerEndpoint()
     {
-        RestAssured.baseURI = baseURI;
-        RestAssured.port = port;
-        configureRequestSpec().setBaseUri(baseURI);
-        configureRequestSpec().setPort(port);
+        requestSpecBuilder = new RequestSpecBuilder();
+
+        // use static variables for logs, etc
+        // the request spec is built from data set via setters, see RestWrapper#onRequest
+        RestAssured.baseURI = this.serverURI;
+        RestAssured.port = this.serverPort;
+
+        configureRequestSpec().setBaseUri(this.serverURI);
+        configureRequestSpec().setPort(this.serverPort);
     }
 }

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

@@ -20,6 +20,10 @@ public class RestPaginationModel extends TestModel implements IModelAssertion<Re
 {
     private int count;
     private boolean hasMoreItems;
+    /**
+     * {code}totalItems{code} is optional and some endpoints don't include it e.g. GET sites/{siteId}/members
+     * See the section entitled "The list object" in https://ts.alfresco.com/share/page/site/prodman/document-details?nodeRef=workspace://SpacesStore/17eacc65-28e5-40bb-8113-edb8c21d57a5
+     */
     private Integer totalItems;
     private int skipCount;
     private int maxItems;
@@ -44,6 +48,11 @@ public class RestPaginationModel extends TestModel implements IModelAssertion<Re
         this.hasMoreItems = hasMoreItems;
     }
 
+    /**
+     * Get the totalItems.
+     *
+     * @return The total number of items, or null if it was not included in the response.
+     */
     public Integer getTotalItems()
     {
         return totalItems;
@@ -75,14 +84,14 @@ public class RestPaginationModel extends TestModel implements IModelAssertion<Re
     }
 
     @Override
-    public ModelAssertion<RestPaginationModel> assertThat() 
+    public ModelAssertion<RestPaginationModel> assertThat()
     {
-      return new ModelAssertion<RestPaginationModel>(this);
-    }       
-    
+      return new ModelAssertion<>(this);
+    }
+
     @Override
-    public ModelAssertion<RestPaginationModel> and() 
+    public ModelAssertion<RestPaginationModel> and()
     {
       return assertThat();
-    }       
+    }
 }    

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

@@ -85,7 +85,7 @@ public class People extends ModelRequest<People>
         {
             while ((activityCollection.isEmpty() || activityCollection.getPagination().getCount() != expectedNoOfEntries) && retry < Utility.retryCountSeconds + 20)
             {
-                Utility.waitToLoopTime(2);
+                Thread.sleep(300);
                 activityCollection = restWrapper.processModels(RestActivityModelsCollection.class, request);
                 retry++;
             }