From 099e1328c0fd0cfdcca111e0f10bad292bcc6bcd Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 31 Jul 2019 15:54:40 +0100 Subject: [PATCH] Remove several references to unthrown checked exceptions. --- .../alfresco/rest/core/JsonBodyGenerator.java | 2 +- .../org/alfresco/rest/core/RestWrapper.java | 8 +--- .../java/org/alfresco/rest/requests/Site.java | 47 +++++++------------ .../org/alfresco/rest/requests/Trashcan.java | 24 ++++------ .../rest/requests/search/SearchAPI.java | 16 +------ .../rest/requests/search/SearchSQLAPI.java | 2 +- 6 files changed, 32 insertions(+), 67 deletions(-) diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/JsonBodyGenerator.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/JsonBodyGenerator.java index 4a7123d571..f43d23aea6 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/JsonBodyGenerator.java +++ b/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() diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java index a92edb9cdb..8b73c5f072 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/core/RestWrapper.java @@ -348,10 +348,8 @@ public class RestWrapper extends DSLWrapper /** * Process responses for site relations models, such as {@link RestSiteModel, RestSiteContainerModelsCollection, RestSiteMemberModelsCollection} - * - * @throws Exception */ - public List processRelationsJson(RestRequest restRequest) throws Exception + public List processRelationsJson(RestRequest restRequest) { List jsonObjects = new ArrayList(); Response returnedResponse = sendRequest(restRequest); @@ -401,10 +399,8 @@ public class RestWrapper extends DSLWrapper /** * Process responses for site relations models, such as {@link RestSiteModel, RestSiteContainerModelsCollection, RestSiteMemberModelsCollection} - * - * @throws Exception */ - public List> processSitesRelationsJson(RestRequest restRequest) throws Exception + public List> processSitesRelationsJson(RestRequest restRequest) { List> allObjects = new ArrayList>(); List sitesList = new ArrayList(); diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Site.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Site.java index 23873146cc..32b0d38b35 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Site.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Site.java @@ -35,11 +35,10 @@ public class Site extends ModelRequest /** * 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 /** * Retrieve one site using GET call on "sites/{siteId}" along with relations parameter * - * @param siteId * @return * @throws JsonToModelConversionException */ - public List getSiteWithRelations() throws Exception + public List 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 * @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 * @return * @throws JsonToModelConversionException */ - public List> getSitesWithRelations() throws Exception + public List> getSitesWithRelations() { RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, "sites?{parameters}", restWrapper.getParameters()); return restWrapper.processSitesRelationsJson(request); @@ -87,10 +85,9 @@ public class Site extends ModelRequest * * @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 * @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 /** * 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 * @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 /** * 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 * @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 /** * 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 /** * 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 /** * 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 * 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 * 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 * 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); diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Trashcan.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Trashcan.java index 16097a122f..2ac9b52dd4 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Trashcan.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Trashcan.java @@ -21,9 +21,8 @@ public class Trashcan extends ModelRequest * 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 * * @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 * * @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 * * @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 * * @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 * * @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 * @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 * @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); diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchAPI.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchAPI.java index 3ab77306f4..832c10bb92 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchAPI.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchAPI.java @@ -18,17 +18,13 @@ */ package org.alfresco.rest.requests.search; -import com.fasterxml.jackson.core.JsonProcessingException; - +import io.restassured.RestAssured; import org.alfresco.rest.core.RestRequest; import org.alfresco.rest.core.RestWrapper; -import org.alfresco.rest.exception.ModelToJsonConversionException; 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 @@ -45,15 +41,7 @@ public class SearchAPI extends ModelRequest public SearchResponse search(SearchRequest queryBody) { - RestRequest request; - try - { - request = RestRequest.requestWithBody(HttpMethod.POST, queryBody.toJson(), "search"); - } - catch (JsonProcessingException e) - { - throw new ModelToJsonConversionException(queryBody.getClass(), e); - } + RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, queryBody.toJson(), "search"); return restWrapper.processModels(SearchResponse.class, request); } } diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchSQLAPI.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchSQLAPI.java index bba6a2bf62..37984cf14b 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchSQLAPI.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/search/SearchSQLAPI.java @@ -131,7 +131,7 @@ public class SearchSQLAPI extends ModelRequest 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();