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

This reverts commit 3c818df7f1.

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

@@ -31,5 +31,7 @@ jobs:
       script:
         # Use full history for release
         - git checkout -B "${TRAVIS_BRANCH}"
+        # Add email to link commits to user
+        - git config user.email "${GIT_EMAIL}"
         # Skip building of release commits
-        - mvn --batch-mode  -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform
+        - mvn --batch-mode  -DscmCommentPrefix="[maven-release-plugin][skip ci] " -Dusername="${GIT_USERNAME}" -Dpassword="${GIT_PASSWORD}" -DskipTests -Darguments=-DskipTests release:clean release:prepare release:perform

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.6</version>
+    <version>1.14</version>
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-super-pom</artifactId>
@@ -28,17 +28,15 @@
         <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.0</tas.utility.version>
+        <tas.utility.version>3.0.8</tas.utility.version>
         <rest-assured.version>3.3.0</rest-assured.version>
         <httpclient-osgi-version>4.5.2</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-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <maven-release.version>2.5.3</maven-release.version>
         <org.glassfish.version>1.0.4</org.glassfish.version>
-        <maven-remote-resources.version>1.6.0</maven-remote-resources.version>
         <commons-lang3.version>3.8</commons-lang3.version>
         <scribejava-apis.version>6.5.1</scribejava-apis.version>
         <test.exclude />
@@ -50,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.6</tag>
+        <tag>v1.14</tag>
     </scm>
 
     <issueManagement>
@@ -95,39 +93,6 @@
                     <tagNameFormat>v@{project.version}</tagNameFormat>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>${maven-remote-resources.version}</version>
-                <configuration>
-                    <includes>
-                        <include>shared-resources/**/*</include>
-                    </includes>
-                    <resourceBundles>
-                        <resourceBundle>org.alfresco.tas:utility:${tas.utility.version}</resourceBundle>
-                    </resourceBundles>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                            <goal>bundle</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -163,18 +128,6 @@
                     </arguments>
                     <mainClass>org.alfresco.rest.core.swagger.Generator</mainClass>
                 </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
 			<plugin>
 			  <groupId>org.apache.maven.plugins</groupId>
@@ -196,14 +149,6 @@
 			  </executions>
 			</plugin>			
         </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>shared-resources/**/*</include>
-                </includes>
-            </resource>
-        </resources>
     </build>
 
     <dependencies>

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

@@ -149,7 +149,7 @@ public class JsonBodyGenerator
     }
     
     
-    public static String siteMember(UserModel userModel) throws Exception
+    public static String siteMember(UserModel userModel)
     {
         Utility.checkObjectIsInitialized(userModel.getUserRole(), "userModel.getUserRole()");
         JsonObject value = defineJSON()

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,11 +148,9 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
     @PostConstruct
     public void initializeRequestSpecBuilder()
     {
-        requestSpecBuilder = new RequestSpecBuilder();
-        RestAssured.baseURI = restProperties.envProperty().getTestServerUrl();
-        RestAssured.port = restProperties.envProperty().getPort();
-        configureRequestSpec().setBaseUri(restProperties.envProperty().getTestServerUrl());
-        configureRequestSpec().setPort(restProperties.envProperty().getPort());
+        this.serverURI = restProperties.envProperty().getTestServerUrl();
+        this.serverPort = restProperties.envProperty().getPort();
+        configureServerEndpoint();
     }
 
     /**
@@ -348,10 +363,8 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
 
     /**
      * Process responses for site relations models, such as {@link RestSiteModel, RestSiteContainerModelsCollection, RestSiteMemberModelsCollection}
-     * 
-     * @throws Exception
      */
-    public List<Object> processRelationsJson(RestRequest restRequest) throws Exception
+    public List<Object> processRelationsJson(RestRequest restRequest)
     {
         List<Object> jsonObjects = new ArrayList<Object>();
         Response returnedResponse = sendRequest(restRequest);
@@ -401,10 +414,8 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
 
     /**
      * Process responses for site relations models, such as {@link RestSiteModel, RestSiteContainerModelsCollection, RestSiteMemberModelsCollection}
-     * 
-     * @throws Exception
      */
-    public List<List<Object>> processSitesRelationsJson(RestRequest restRequest) throws Exception
+    public List<List<Object>> processSitesRelationsJson(RestRequest restRequest)
     {
         List<List<Object>> allObjects = new ArrayList<List<Object>>();
         List<Object> sitesList = new ArrayList<Object>();
@@ -621,7 +632,7 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
 
         logResponseInformation(restRequest, returnedResponse);
 
-        initializeRequestSpecBuilder();
+        configureServerEndpoint();
         response = new RestResponse(returnedResponse);
         return returnedResponse;
     }
@@ -1096,17 +1107,31 @@ public class RestWrapper extends DSLWrapper<RestWrapper>
 
     public void configureSyncServiceEndPoint()
     {
-        RestAssured.baseURI = restProperties.envProperty().getSyncServerUrl();
-        RestAssured.port = restProperties.envProperty().getSyncPort();
-        configureRequestSpec().setBaseUri(restProperties.envProperty().getSyncServerUrl());
-        configureRequestSpec().setPort(restProperties.envProperty().getSyncPort());
+        this.serverURI = restProperties.envProperty().getSyncServerUrl();
+        this.serverPort = restProperties.envProperty().getSyncPort();
+        configureServerEndpoint();
     }
 
     public void configureSolrEndPoint()
     {
-        RestAssured.baseURI = restProperties.envProperty().getSolrServerUrl();
-        RestAssured.port = restProperties.envProperty().getSolrPort();
-        configureRequestSpec().setBaseUri(restProperties.envProperty().getSolrServerUrl());
-        configureRequestSpec().setPort(restProperties.envProperty().getSolrPort());
+        this.serverURI = restProperties.envProperty().getSolrServerUrl();
+        this.serverPort = restProperties.envProperty().getSolrPort();
+        configureServerEndpoint();
+    }
+
+    /**
+     * Use {@link #setServerURI(String)} and {@link #setServerPort(int)}
+     */
+    public void configureServerEndpoint()
+    {
+        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/exception/ModelToJsonConversionException.java

@@ -0,0 +1,11 @@
+package org.alfresco.rest.exception;
+
+public class ModelToJsonConversionException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+
+    public <T> ModelToJsonConversionException(Class<T> classz, Exception e)
+    {
+        super(String.format("Could not convert model for [%s] to JSON", classz.getName()), e);
+    }
+}

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

@@ -382,7 +382,7 @@ public class Node extends ModelRequest<Node>
     public void createNodeRenditionIfNotExists(String renditionId) throws Exception
     {
         getNodeRendition(renditionId);
-        if (HttpStatus.OK.toString().equals(restWrapper.getStatusCode()))
+        if (Integer.valueOf(restWrapper.getStatusCode()).equals(HttpStatus.OK.value()))
         {
             String postBody = JsonBodyGenerator.keyValueJson("id", renditionId);
             RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, "nodes/{nodeId}/renditions", repoModel.getNodeRef());
@@ -415,7 +415,7 @@ public class Node extends ModelRequest<Node>
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "nodes/{nodeId}/renditions/{renditionId}",repoModel.getNodeRef(), renditionId);
         RestRenditionInfoModel renditions = restWrapper.processModel(RestRenditionInfoModel.class, request);
         int retry = 0;
-        if (restWrapper.getStatusCode().equals(HttpStatus.OK.toString()))
+        if (Integer.valueOf(restWrapper.getStatusCode()).equals(HttpStatus.OK.value()))
         {
             while (renditions.getStatus().equals("NOT_CREATED") && retry < Utility.retryCountSeconds - 8)
             {
@@ -442,7 +442,7 @@ public class Node extends ModelRequest<Node>
                 renditionId);
         RestResponse response = restWrapper.process(request);
         int retry = 0;
-        while (response.getStatusCode().equals(HttpStatus.NOT_FOUND.toString()) && retry < Utility.retryCountSeconds)
+        while (Integer.valueOf(response.getStatusCode()).equals(HttpStatus.NOT_FOUND.value()) && retry < Utility.retryCountSeconds)
         {
             Utility.waitToLoopTime(1);
             response = restWrapper.process(request);

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

@@ -81,7 +81,7 @@ public class People extends ModelRequest<People>
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "people/{personId}/activities?{parameters}", this.person.getUsername(), restWrapper.getParameters());
         RestActivityModelsCollection activityCollection = restWrapper.processModels(RestActivityModelsCollection.class, request);
         int retry = 0;
-        if (restWrapper.getStatusCode().equals(HttpStatus.OK.toString()))
+        if (Integer.valueOf(restWrapper.getStatusCode()).equals(HttpStatus.OK.value()))
         {
             while ((activityCollection.isEmpty() || activityCollection.getPagination().getCount() != expectedNoOfEntries) && retry < Utility.retryCountSeconds + 20)
             {

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

@@ -35,11 +35,10 @@ public class Site extends ModelRequest<Site>
   /**
    * Retrieve one site using GET call on "sites/{siteId}"
    * 
-   * @param siteId
    * @return
    * @throws JsonToModelConversionException
    */
-  public RestSiteModel getSite() throws Exception
+  public RestSiteModel getSite()
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites/{siteId}?{parameters}", this.site.getId(), restWrapper.getParameters());
       return restWrapper.processModel(RestSiteModel.class, request);
@@ -48,11 +47,10 @@ public class Site extends ModelRequest<Site>
   /**
    * Retrieve one site using GET call on "sites/{siteId}" along with relations parameter
    * 
-   * @param siteId
    * @return
    * @throws JsonToModelConversionException
    */
-  public List<Object> getSiteWithRelations() throws Exception
+  public List<Object> getSiteWithRelations()
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites/{siteId}?{parameters}", this.site.getId(), restWrapper.getParameters());
       return restWrapper.processRelationsJson(request);
@@ -64,7 +62,7 @@ public class Site extends ModelRequest<Site>
    * @return
    * @throws JsonToModelConversionException
    */
-  public RestSiteModelsCollection getSites() throws Exception
+  public RestSiteModelsCollection getSites()
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites?{parameters}", restWrapper.getParameters());
       return restWrapper.processModels(RestSiteModelsCollection.class, request);
@@ -76,7 +74,7 @@ public class Site extends ModelRequest<Site>
    * @return
    * @throws JsonToModelConversionException
    */
-  public List<List<Object>> getSitesWithRelations() throws Exception
+  public List<List<Object>> getSitesWithRelations()
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites?{parameters}", restWrapper.getParameters());
       return restWrapper.processSitesRelationsJson(request);
@@ -87,10 +85,9 @@ public class Site extends ModelRequest<Site>
    * 
    * @param person {@link UserModel}
    * @return
-   * @throws Exception
    * @throws JsonToModelConversionException
    */
-  public RestSiteMemberModel addPerson(UserModel person) throws Exception
+  public RestSiteMemberModel addPerson(UserModel person)
   {
       String siteMemberBody = JsonBodyGenerator.siteMember(person);
       RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, siteMemberBody, "sites/{siteId}/members?{parameters}", site.getId(), restWrapper.getParameters());
@@ -103,7 +100,7 @@ public class Site extends ModelRequest<Site>
    * @return
    * @throws JsonToModelConversionException
    */
-  public RestSiteMemberModelsCollection getSiteMembers() throws Exception
+  public RestSiteMemberModelsCollection getSiteMembers()
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites/{siteId}/members?{parameters}", site.getId(), restWrapper.getParameters());
       return restWrapper.processModels(RestSiteMemberModelsCollection.class, request);
@@ -112,12 +109,11 @@ public class Site extends ModelRequest<Site>
   /**
    * Retrieve specific member of a site using GET call on "sites/{siteId}/members/{personId}"
    * 
-   * @param siteId
-   * @param personid
+   * @param user A model containing the username to look for.
    * @return
    * @throws JsonToModelConversionException
    */
-  public RestSiteMemberModel getSiteMember(UserModel user) throws Exception
+  public RestSiteMemberModel getSiteMember(UserModel user)
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites/{siteId}/members/{personId}?{parameters}", site.getId(), user.getUsername(), restWrapper.getParameters());
       return restWrapper.processModel(RestSiteMemberModel.class, request);
@@ -129,7 +125,7 @@ public class Site extends ModelRequest<Site>
    * @return
    * @throws JsonToModelConversionException
    */
-  public RestSiteMemberModel updateSiteMember(UserModel siteMember) throws Exception
+  public RestSiteMemberModel updateSiteMember(UserModel siteMember)
   {
       String json = JsonBodyGenerator.keyValueJson("role", siteMember.getUserRole().toString());
       RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, json, "sites/{siteId}/members/{personId}", site.getId(), siteMember.getUsername());
@@ -139,9 +135,8 @@ public class Site extends ModelRequest<Site>
   /**
    * Delete site member with DELETE call on "sites/{siteId}/members/{personId}"
    * @param person
-   * @throws Exception
    */
-  public void deleteSiteMember(UserModel person) throws Exception
+  public void deleteSiteMember(UserModel person)
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "sites/{siteId}/members/{personId}", site.getId(), person.getUsername());
       restWrapper.processEmptyModel(request);
@@ -153,7 +148,7 @@ public class Site extends ModelRequest<Site>
    * @return
    * @throws JsonToModelConversionException
    */
-  public RestSiteContainerModelsCollection getSiteContainers() throws Exception
+  public RestSiteContainerModelsCollection getSiteContainers()
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites/{siteId}/containers?{parameters}", site.getId(), restWrapper.getParameters());
       return restWrapper.processModels(RestSiteContainerModelsCollection.class, request);
@@ -162,12 +157,11 @@ public class Site extends ModelRequest<Site>
   /**
    * Retrieve specific container of a site using GET call on "sites/{siteId}/containers/{containerId}"
    * 
-   * @param siteId
-   * @param folderId
+   * @param container A model containing the folderId to look for.
    * @return
    * @throws JsonToModelConversionException
    */
-  public RestSiteContainerModel getSiteContainer(RestSiteContainerModel container) throws Exception
+  public RestSiteContainerModel getSiteContainer(RestSiteContainerModel container)
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites/{siteId}/containers/{containerId}?{parameters}", site.getId(), container.getFolderId(), restWrapper.getParameters());
       return restWrapper.processModel(RestSiteContainerModel.class, request);
@@ -176,12 +170,11 @@ public class Site extends ModelRequest<Site>
   /**
    * Retrieve specific container of a site using GET call on "sites/{siteId}/containers/{containerId}"
    * 
-   * @param siteId
-   * @param folderId
+   * @param containerFolder The id of the container to look for.
    * @return
    * @throws JsonToModelConversionException
    */
-  public RestSiteContainerModel getSiteContainer(String containerFolder) throws Exception
+  public RestSiteContainerModel getSiteContainer(String containerFolder)
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites/{siteId}/containers/{containerId}?{parameters}", site.getId(), containerFolder, restWrapper.getParameters());
       return restWrapper.processModel(RestSiteContainerModel.class, request);
@@ -190,7 +183,6 @@ public class Site extends ModelRequest<Site>
   /**
    * Create a collaboration site
    * 
-   * @param site information on the site to create
    * @return the properties of the created site
    * @throws Exception
    */
@@ -204,9 +196,8 @@ public class Site extends ModelRequest<Site>
    * Get site membership requests by using GET /site-membership-requests
    * 
    * @return site memberships
-   * @throws Exception
    */
-  public RestSitePersonMembershipRequestModelsCollection getSiteMemberships() throws Exception
+  public RestSitePersonMembershipRequestModelsCollection getSiteMemberships()
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "site-membership-requests?{parameters}", restWrapper.getParameters());
       return restWrapper.processModels(RestSitePersonMembershipRequestModelsCollection.class, request);
@@ -216,9 +207,8 @@ public class Site extends ModelRequest<Site>
    * Approve a site membership request by using POST call on /sites/{siteId}/site-membership-requests/{inviteeId}/approve
    * 
    * @param siteMember
-   * @throws Exception
    */
-  public RestResponse approveSiteMembership(UserModel siteMember) throws Exception
+  public RestResponse approveSiteMembership(UserModel siteMember)
   {
       String json = JsonBodyGenerator.keyValueJson("role", siteMember.getUserRole().toString());
       RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, json, "sites/{siteId}/site-membership-requests/{inviteeId}/approve", site.getId(), siteMember.getUsername());
@@ -229,9 +219,8 @@ public class Site extends ModelRequest<Site>
    * Reject a site membership request by using POST call /sites/{siteId}/site-membership-requests/{inviteeId}/reject
    * 
    * @param siteMember
-   * @throws Exception
    */
-  public RestResponse rejectSiteMembership(UserModel siteMember) throws Exception
+  public RestResponse rejectSiteMembership(UserModel siteMember)
   {
       RestRequest request = RestRequest.simpleRequest(HttpMethod.POST, "sites/{siteId}/site-membership-requests/{inviteeId}/reject", site.getId(), siteMember.getUsername());
       return restWrapper.process(request);

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

@@ -43,7 +43,7 @@ public class Tenant extends ModelRequest<Tenant>
                 .contentType(ContentType.JSON);
         Response returnedResponse = request.contentType(ContentType.JSON).body(json)
                 .post(String.format("%s/%s", restProperties.envProperty().getFullServerUrl(), "alfresco/service/api/tenants")).andReturn();
-        if (!String.valueOf(returnedResponse.getStatusCode()).equals(HttpStatus.OK.toString()))
+        if (!Integer.valueOf(returnedResponse.getStatusCode()).equals(HttpStatus.OK.value()))
         {
             throw new Exception(String.format("Tenant is not created: %s", returnedResponse.asString()));
         }

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

@@ -21,9 +21,8 @@ public class Trashcan extends ModelRequest<Trashcan>
      * GET on deleted-nodes
      * 
      * @return RestNodeModelsCollection
-     * @throws Exception
      */
-    public RestNodeModelsCollection findDeletedNodes() throws Exception
+    public RestNodeModelsCollection findDeletedNodes()
     {
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "deleted-nodes?{parameters}", restWrapper.getParameters());
         return restWrapper.processModels(RestNodeModelsCollection.class, request);
@@ -34,9 +33,8 @@ public class Trashcan extends ModelRequest<Trashcan>
      * 
      * @param repoModel
      * @return RestNodeModel
-     * @throws Exception
      */
-    public RestNodeModel findDeletedNode(RepoTestModel repoModel) throws Exception
+    public RestNodeModel findDeletedNode(RepoTestModel repoModel)
     {
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "deleted-nodes/{nodeId}?{parameters}", repoModel.getNodeRefWithoutVersion(), restWrapper.getParameters());
         return restWrapper.processModel(RestNodeModel.class, request);
@@ -47,9 +45,8 @@ public class Trashcan extends ModelRequest<Trashcan>
      *
      * @param repoModel
      * @return
-     * @throws Exception
      */
-    public void deleteNodeFromTrashcan(RepoTestModel repoModel) throws Exception
+    public void deleteNodeFromTrashcan(RepoTestModel repoModel)
     {
         RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, "deleted-nodes/{nodeId}", repoModel.getNodeRefWithoutVersion());
         restWrapper.processEmptyModel(request);
@@ -60,9 +57,8 @@ public class Trashcan extends ModelRequest<Trashcan>
      *
      * @param repoModel
      * @return RestNodeModel
-     * @throws Exception
      */
-    public RestNodeModel restoreNodeFromTrashcan(RepoTestModel repoModel) throws Exception
+    public RestNodeModel restoreNodeFromTrashcan(RepoTestModel repoModel)
     {
         RestRequest request = RestRequest.simpleRequest(HttpMethod.POST, "deleted-nodes/{nodeId}/restore?{parameters}", repoModel.getNodeRefWithoutVersion(), restWrapper.getParameters());
         return restWrapper.processModel(RestNodeModel.class, request);
@@ -73,9 +69,8 @@ public class Trashcan extends ModelRequest<Trashcan>
      * 
      * @param repoModel
      * @return RestResponse
-     * @throws Exception
      */
-    public RestResponse getDeletedNodeContent(RepoTestModel repoModel) throws Exception
+    public RestResponse getDeletedNodeContent(RepoTestModel repoModel)
     {
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "deleted-nodes/{nodeId}/content?{parameters}", repoModel.getNodeRefWithoutVersion(), restWrapper.getParameters());
         return restWrapper.process(request);
@@ -86,9 +81,8 @@ public class Trashcan extends ModelRequest<Trashcan>
      * 
      * @param repoModel
      * @return RestRenditionInfoModelCollection
-     * @throws Exception
      */
-    public RestRenditionInfoModelCollection getDeletedNodeRenditions(RepoTestModel repoModel) throws Exception
+    public RestRenditionInfoModelCollection getDeletedNodeRenditions(RepoTestModel repoModel)
     {
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "deleted-nodes/{nodeId}/renditions?{parameters}", repoModel.getNodeRefWithoutVersion(), restWrapper.getParameters());
         return restWrapper.processModels(RestRenditionInfoModelCollection.class, request);
@@ -100,9 +94,8 @@ public class Trashcan extends ModelRequest<Trashcan>
      * @param repoModel
      * @param renditionId
      * @return RestRenditionInfoModel
-     * @throws Exception
      */
-    public RestRenditionInfoModel getDeletedNodeRendition(RepoTestModel repoModel, String renditionId) throws Exception
+    public RestRenditionInfoModel getDeletedNodeRendition(RepoTestModel repoModel, String renditionId)
     {
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "deleted-nodes/{nodeId}/renditions/{renditionId}?{parameters}", repoModel.getNodeRefWithoutVersion(), renditionId, restWrapper.getParameters());
         return restWrapper.processModel(RestRenditionInfoModel.class, request);
@@ -114,9 +107,8 @@ public class Trashcan extends ModelRequest<Trashcan>
      * @param repoModel
      * @param renditionId
      * @return RestResponse
-     * @throws Exception
      */
-    public RestResponse getDeletedNodeRenditionContent(RepoTestModel repoModel, String renditionId) throws Exception
+    public RestResponse getDeletedNodeRenditionContent(RepoTestModel repoModel, String renditionId)
     {
         RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "deleted-nodes/{nodeId}/renditions/{renditionId}/content?{parameters}", repoModel.getNodeRefWithoutVersion(), renditionId, restWrapper.getParameters());
         return restWrapper.process(request);

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

@@ -18,14 +18,13 @@
  */
 package org.alfresco.rest.requests.search;
 
+import io.restassured.RestAssured;
 import org.alfresco.rest.core.RestRequest;
 import org.alfresco.rest.core.RestWrapper;
 import org.alfresco.rest.requests.ModelRequest;
 import org.alfresco.rest.search.SearchRequest;
 import org.alfresco.rest.search.SearchResponse;
 import org.springframework.http.HttpMethod;
-
-import io.restassured.RestAssured;
 /**
  * Wrapper for Search API.
  * @author Michael Suzuki
@@ -40,7 +39,7 @@ public class SearchAPI extends ModelRequest<SearchAPI>
         restWrapper.configureRequestSpec().setBasePath(RestAssured.basePath);
     }
 
-    public SearchResponse search(SearchRequest queryBody) throws Exception
+    public SearchResponse search(SearchRequest queryBody)
     {
         RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, queryBody.toJson(), "search");
         return restWrapper.processModels(SearchResponse.class, request);

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

@@ -131,7 +131,7 @@ public class SearchSQLAPI extends ModelRequest<SearchSQLAPI>
         restWrapper.configureRequestSpec().setBasePath(RestAssured.basePath);
     }
 
-    public RestResponse searchSql(SearchSqlRequest query) throws Exception
+    public RestResponse searchSql(SearchSqlRequest query)
     {
         String stmt = (null == query.getSql() || query.getSql().isEmpty()) ? "" : query.getSql();
 

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

@@ -34,16 +34,16 @@ public class SearchScoreModel extends TestModel implements IRestModel<SearchScor
 {
     
     @JsonProperty(required = true)
-    private int score;
+    private float score;
     
     private List<ResponseHighLightModel> highlight;
 
-    public int getScore()
+    public float getScore()
     {
         return score;
     }
 
-    public void setScore(int score)
+    public void setScore(float score)
     {
         this.score = score;
     }

packaging/tests/tas-restapi/src/main/resources/shared-resources/rest-runner-suite.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="REST API" parallel="false" preserve-order="true" thread-count="1">
-	<listeners>
-		<listener class-name="org.alfresco.utility.report.HtmlReportListener"></listener>
-		<listener class-name="org.alfresco.utility.testrail.TestRailExecutorListener"></listener>
-		<listener class-name="org.alfresco.utility.testng.OSTestMethodSelector"></listener>
-	</listeners>	
-	<test name="RestAPI">
-		<method-selectors>
-			<!-- -DincludeGroups=sanity,comments,people -DexcludeGroups=networks,othergroup -DrunBugs=true-->
-			<method-selector>
-				<script language="beanshell"><![CDATA[
-                includedGroups = System.getProperty("includeGroups");
-                excludedGroups = System.getProperty("excludeGroups");				
-				runBugs = System.getProperty("runBugs");
-
-			    if((runBugs != null))
-			    {
-			     bugAnnotated = method.getAnnotation(org.alfresco.utility.report.Bug.class);
-			
-			     if (bugAnnotated != null && runBugs.equals("false") )
-			     {
-			      return false;
-			     }
-			    }
-				
-                if ((includedGroups == null) || (includedGroups.isEmpty())) {
-                	return false;
-                } else
-                {
-                   StringTokenizer includedGroupsList = new StringTokenizer(includedGroups, ",");
-
-					if ((excludedGroups != null)) {
-						StringTokenizer excludedGroupsList = new StringTokenizer(excludedGroups, ",");
-						while (excludedGroupsList.hasMoreTokens()) {
-						exG = excludedGroupsList.nextToken();
-						if (groups.containsKey(exG))
-						{
-							return  false;
-						}
-						}
-					}
-
-                    while (includedGroupsList.hasMoreTokens()) {
-                      grp = includedGroupsList.nextToken();
-                      if ((groups.containsKey(grp)))
-                      {
-                      	 return true;
-                      }
-                    }
-                }
-                return false;
-                ]]>
-				</script>
-			</method-selector>
-		</method-selectors>
-		<packages>
-			<package name="org.alfresco.rest.*" />
-		</packages>
-
-	</test> <!-- Test -->
-</suite> <!-- Suite -->

packaging/tests/tas-restapi/src/main/resources/shared-resources/testCount.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="REST API">
-	<listeners>
-		<listener class-name="org.alfresco.utility.report.TestCountListener"></listener>
-	</listeners>
-	<test name="RestAPITests">
-		<groups>
-			<run>
-				<exclude name="demo" />
-				<exclude name="unit" />
-			</run>
-		</groups>
-		<packages>
-			<package name="org.alfresco.rest.*"></package>
-		</packages>
-	</test> <!-- Test -->
-</suite> <!-- Suite -->

packaging/tests/tas-restapi/src/main/resources/shared-resources/testdata/UTF-8File.txt

@@ -1 +0,0 @@
- ∮ E⋅da = Q

packaging/tests/tas-restapi/src/main/resources/shared-resources/testdata/iso8859File.txt

@@ -1 +0,0 @@
-<html><head><title>aegif Mind Share Leader Generating New Paradigms by aegif corporation</title></head><body><p> Test html</p></body></html></body></html>

packaging/tests/tas-restapi/src/main/resources/shared-resources/testdata/quick/quick.txt

@@ -1,7 +0,0 @@
-The quick brown fox jumps over the lazy dog
-
-Le renard brun rapide saute par-dessus le chien paresseux
-
-Der schnelle braune Fuchs springt über den faulen Hund
-
-براون وكس السريع يقفز فوق الكلب كسالي

packaging/tests/tas-restapi/src/main/resources/shared-resources/testdata/sampleContent.txt

@@ -1 +0,0 @@
-Sample text.