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

* SEARCH-1681 Adding the shard params instance to the RestInstanceModel

* SEARCH-1681 Adding the changes from the review

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.22</version>
+    <version>1.38</version>
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-super-pom</artifactId>
@@ -28,16 +28,16 @@
         <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.16</tas.utility.version>
+        <tas.utility.version>3.0.20</tas.utility.version>
         <rest-assured.version>3.3.0</rest-assured.version>
-        <httpclient-osgi-version>4.5.10</httpclient-osgi-version>
+        <httpclient-osgi-version>4.5.3</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.1.4</org.glassfish.version>
-        <commons-lang3.version>3.9</commons-lang3.version>
+        <commons-lang3.version>3.10</commons-lang3.version>
         <scribejava-apis.version>6.9.0</scribejava-apis.version>
         <test.exclude />
         <test.include />
@@ -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.22</tag>
+        <tag>v1.38</tag>
     </scm>
 
     <issueManagement>
@@ -255,7 +255,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.29</version>
+            <version>1.7.30</version>
         </dependency>
         
 		<!-- swagger parser -->
@@ -282,14 +282,14 @@
 		<dependency>
 		    <groupId>org.codehaus.groovy</groupId>
 		    <artifactId>groovy</artifactId>
-		    <version>2.5.8</version>
+		    <version>2.5.9</version>
 		</dependency>
 		
 		<!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->
 		<dependency>
 		    <groupId>org.codehaus.groovy</groupId>
 		    <artifactId>groovy-json</artifactId>
-		    <version>2.5.8</version>
+		    <version>2.5.9</version>
 		</dependency>	
 
 	</dependencies>

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

@@ -166,6 +166,19 @@ public class JsonBodyGenerator
                 .add("title", title).build();
         return value.toString();
     }
+    /**
+     * Method to create a Json object for SiteBody with site title, description, visibility
+     * @param siteModel
+     * @return String
+     */
+    public static String updateSiteRequest(SiteModel siteModel)
+    {
+        JsonObject value = defineJSON()
+                .add("title", siteModel.getTitle())
+                .add("description", siteModel.getDescription())
+                .add("visibility", siteModel.getVisibility().toString()).build();
+        return value.toString();
+    }
 
     public static String process(String processDefinitionKey, UserModel assignee, boolean sendEmailNotifications, Priority priority)
     {

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

@@ -42,6 +42,7 @@ import org.alfresco.rest.requests.search.SearchSQLAPI;
 import org.alfresco.rest.requests.search.SearchSQLJDBC;
 import org.alfresco.rest.requests.search.ShardInfoAPI;
 import org.alfresco.rest.requests.search.SolrAPI;
+import org.alfresco.rest.requests.search.SolrAdminAPI;
 import org.alfresco.rest.requests.workflowAPI.RestWorkflowAPI;
 import org.alfresco.utility.LogFactory;
 import org.alfresco.utility.Utility;
@@ -955,6 +956,11 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
     {
         return new SolrAPI(this);
     }
+    
+    public SolrAdminAPI withSolrAdminAPI()
+    {
+        return new SolrAdminAPI(this);
+    }
 
     /**
      * @return {@link RestDiscoveryAPI} using the rest Discovery API as prefix: {@link /alfresco/api/discovery}
@@ -1134,4 +1140,15 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
         configureRequestSpec().setBaseUri(this.serverURI);
         configureRequestSpec().setPort(this.serverPort);
     }
+
+    /** 
+     * Adding new method to configure Alfresco Endpoint.
+     * Reconfiguration is required when restClient is used to executed apis on different <host>:<port> e.g. solr api followed by search api
+     */
+    public void configureAlfrescoEndpoint()
+    {        
+        this.serverURI = restProperties.envProperty().getTestServerUrl();
+        this.serverPort = restProperties.envProperty().getPort();
+        configureServerEndpoint();
+    }
 }

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

@@ -0,0 +1,127 @@
+/*
+ * Copyright 2020 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.utility.model.TestModel;
+
+public class RestIdentityServiceConfigurationModel extends TestModel{
+
+	public RestIdentityServiceConfigurationModel() {
+		
+	}
+	
+	private String authenticationChain;
+	
+	private String authenticationEnabled;
+	
+	private String enableBasicAuth;
+	
+	private String authServerUrl;
+	
+	private String realm;
+	
+	private String resource;
+	
+	private String publicClient;
+	
+	private String sslRequired;
+	
+	private String enablePkce;
+	
+	private String credentialsSecret;
+	
+	private String credentialsProvider;
+
+	public String getAuthenticationChain() {
+		return authenticationChain;
+	}
+
+	public void setAuthenticationChain(String authenticationChain) {
+		this.authenticationChain = authenticationChain;
+	}
+
+	public String getAuthenticationEnabled() {
+		return authenticationEnabled;
+	}
+
+	public void setAuthenticationEnabled(String authenticationEnabled) {
+		this.authenticationEnabled = authenticationEnabled;
+	}
+
+	public String getEnableBasicAuth() {
+		return enableBasicAuth;
+	}
+
+	public void setEnableBasicAuth(String enableBasicAuth) {
+		this.enableBasicAuth = enableBasicAuth;
+	}
+
+	public String getAuthServerUrl() {
+		return authServerUrl;
+	}
+
+	public void setAuthServerUrl(String authServerUrl) {
+		this.authServerUrl = authServerUrl;
+	}
+
+	public String getRealm() {
+		return realm;
+	}
+
+	public void setRealm(String realm) {
+		this.realm = realm;
+	}
+
+	public String getResource() {
+		return resource;
+	}
+
+	public void setResource(String resource) {
+		this.resource = resource;
+	}
+
+	public String getPublicClient() {
+		return publicClient;
+	}
+
+	public void setPublicClient(String publicClient) {
+		this.publicClient = publicClient;
+	}
+
+	public String getSslRequired() {
+		return sslRequired;
+	}
+
+	public void setSslRequired(String sslRequired) {
+		this.sslRequired = sslRequired;
+	}
+
+	public String getEnablePkce() {
+		return enablePkce;
+	}
+
+	public void setEnablePkce(String enablePkce) {
+		this.enablePkce = enablePkce;
+	}
+
+	public String getCredentialsSecret() {
+		return credentialsSecret;
+	}
+
+	public void setCredentialsSecret(String credentialsSecret) {
+		this.credentialsSecret = credentialsSecret;
+	}
+
+	public String getCredentialsProvider() {
+		return credentialsProvider;
+	}
+
+	public void setCredentialsProvider(String credentialsProvider) {
+		this.credentialsProvider = credentialsProvider;
+	}
+}

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

@@ -71,6 +71,8 @@ public class RestPersonModel extends TestModel implements IModelAssertion<RestPe
     private String userStatus;
     private String password;
     private Object properties;
+    private String quotaUsed;
+    private String quota;
     private Map<String, Boolean> capabilities;
 
     public RestPersonModel()
@@ -319,7 +321,25 @@ public class RestPersonModel extends TestModel implements IModelAssertion<RestPe
         this.displayName = displayName;
     }
 
-    /**
+    public String getQuotaUsed() {
+		return quotaUsed;
+	}
+
+
+	public void setQuotaUsed(String quotaUsed) {
+		this.quotaUsed = quotaUsed;
+	}
+
+	public String getQuota() {
+		return quota;
+	}
+
+	public void setQuota(String quota) {
+		this.quota = quota;
+	}
+
+
+	/**
      * Generate a PersonModel with random values for all existing fields excluding fields specified as ingnoredFields
      * 
      * @param ignoredFields field to be excluded when generating a random model

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

@@ -63,6 +63,8 @@ public class RestSyncServiceConfigModel extends TestModel
     @JsonProperty(required = true)
     private RestSyncServiceRepoInfoModel repoInfo;
     
+    private RestIdentityServiceConfigurationModel identityServiceConfig;
+    
     public String getDsyncClientVersionMin()
     {
         return dsyncClientVersionMin;
@@ -77,5 +79,8 @@ public class RestSyncServiceConfigModel extends TestModel
     {
         return repoInfo;
     }
-    
+
+	public RestIdentityServiceConfigurationModel getIdentityServiceConfig() {
+		return identityServiceConfig;
+	}
 }

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

@@ -67,6 +67,8 @@ public class RestSyncServiceModel extends TestModel
     @JsonProperty(required = true)
     private RestSyncServiceConfigModel config;
     
+    private RestIdentityServiceConfigurationModel identityServiceConfig;
+    
     public String getId()
     {
         return id;
@@ -81,5 +83,12 @@ public class RestSyncServiceModel extends TestModel
     {
         return config;
     }
-    
+
+	public RestIdentityServiceConfigurationModel getIdentityServiceConfig() {
+		return identityServiceConfig;
+	}
+
+	public void setIdentityServiceConfig(RestIdentityServiceConfigurationModel identityServiceConfig) {
+		this.identityServiceConfig = identityServiceConfig;
+	}
 }

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)
             {
-                Thread.sleep(300);
+                Utility.waitToLoopTime(2);
                 activityCollection = restWrapper.processModels(RestActivityModelsCollection.class, request);
                 retry++;
             }

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

@@ -192,6 +192,38 @@ public class Site extends ModelRequest<Site>
       return restWrapper.processModel(RestSiteModel.class, request);
   }
 
+  /**
+   * Update a site: Site title, description, visibility can be updated
+   * Body:
+   * {
+   *   "title": "string",
+   *   "description": "string",
+   *   "visibility": "PRIVATE"
+   * }
+   * 
+   * Response:
+   * {
+   *   "entry": {
+   *     "id": "string",
+   *     "guid": "string",
+   *     "title": "string",
+   *     "description": "string",
+   *     "visibility": "PRIVATE",
+   *     "preset": "string",
+   *     "role": "SiteConsumer"
+   *   }
+   * }
+   * 
+   * @return the properties of an updated site
+   * @throws Exception
+   */
+  public RestSiteModel updateSite(SiteModel site) throws Exception
+  {     
+      String siteBody = JsonBodyGenerator.updateSiteRequest(site);
+      RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, siteBody, "sites/{siteId}", site.getId());
+      return restWrapper.processModel(RestSiteModel.class, request);
+  }
+
   /**
    * Get site membership requests by using GET /site-membership-requests
    * 

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

@@ -35,6 +35,7 @@ public class SearchAPI extends ModelRequest<SearchAPI>
     public SearchAPI(RestWrapper restWrapper)
     {
         super(restWrapper);
+        restWrapper.configureAlfrescoEndpoint();
         RestAssured.basePath = "alfresco/api/-default-/public/search/versions/1";
         restWrapper.configureRequestSpec().setBasePath(RestAssured.basePath);
     }

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

@@ -127,6 +127,7 @@ public class SearchSQLAPI extends ModelRequest<SearchSQLAPI>
     public SearchSQLAPI(RestWrapper restWrapper)
     {
         super(restWrapper);
+        restWrapper.configureAlfrescoEndpoint();
         RestAssured.basePath = "alfresco/api/-default-/public/search/versions/1";
         restWrapper.configureRequestSpec().setBasePath(RestAssured.basePath);
     }

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

@@ -42,6 +42,7 @@ public class ShardInfoAPI extends ModelRequest<ShardInfoAPI>
     public ShardInfoAPI(RestWrapper restWrapper)
     {
         super(restWrapper);
+        restWrapper.configureAlfrescoEndpoint();
         RestAssured.basePath = "alfresco/api/-default-/private/search/versions/1";
         restWrapper.configureRequestSpec().setBasePath(RestAssured.basePath);
     }

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

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 Alfresco Software Limited.
+ * This file is part of Alfresco
+ * 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/>.
+ */
+package org.alfresco.rest.requests.search;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.alfresco.rest.core.RestRequest;
+import org.alfresco.rest.core.RestResponse;
+import org.alfresco.rest.core.RestWrapper;
+import org.alfresco.rest.requests.ModelRequest;
+import org.springframework.http.HttpMethod;
+
+import io.restassured.RestAssured;
+import io.restassured.http.Header;
+import io.restassured.http.Headers;
+
+/**
+ * Wrapper for SOLR Admin REST API
+ * 
+ * @author aborroy
+ *
+ */
+public class SolrAdminAPI extends ModelRequest<SolrAdminAPI>
+{
+    public SolrAdminAPI(RestWrapper restWrapper)
+    {  
+        super(restWrapper);
+        RestAssured.basePath = "solr/admin";
+        
+        restWrapper.configureSolrEndPoint();
+        restWrapper.configureRequestSpec().setBasePath(RestAssured.basePath);
+    }
+
+    public RestResponse getAction(String action) throws Exception
+    {
+        List<Header> headers = new ArrayList<Header>();
+        headers.add(new Header("Content-Type", "application/json"));
+        Headers header = new Headers(headers);
+        restWrapper.setResponseHeaders(header);
+        restWrapper.configureRequestSpec().setUrlEncodingEnabled(false);
+        RestRequest request = RestRequest.simpleRequest(HttpMethod.GET,
+                "cores?action=" + action + "&wt=json&{parameters}", restWrapper.getParameters());
+        return restWrapper.process(request);
+    }
+}

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

@@ -57,6 +57,9 @@ public class RestInstanceModel
 
     /** Transactions remaining */
     private Long transactionsRemaining;
+    
+    /** Sharding Parameters */
+    private String shardParams;
 
     /**
      * @return the baseUrl
@@ -233,4 +236,21 @@ public class RestInstanceModel
     {
         this.transactionsRemaining = transactionsRemaining;
     }
+    
+    /**
+     * @return the shardParams
+     */
+    public String getShardParams()
+    {
+        return this.shardParams;
+    }
+
+    /**
+     * @param shardParams the shardParams to set
+     */
+    public void setShardParams(String shardParams)
+    {
+        this.shardParams = shardParams;
+    }
+
 }